From: Stephen Berman <stephen.berman@gmx.net>
Date: Thu, 9 Dec 2010 01:50:08 +0000 (-0800)
Subject: diary-lib fix for bug#7536.
X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1~1^2~421^2~18^2~222
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:///%22http:/www.example.com/cgi/%22https:/www.github.com/%22bookmarks:/?a=commitdiff_plain;h=2029ca8fd037ba4c8b79a9899d453e0eb16f3f07;p=emacs.git

diary-lib fix for bug#7536.
* lisp/calendar/diary-lib.el (diary-list-sexp-entries):
Handle case of no newline at end of file.
---

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 717a522a5dc..b15ddf31467 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1,3 +1,8 @@
+2010-12-09  Stephen Berman  <stephen.berman@gmx.net>
+
+	* calendar/diary-lib.el (diary-list-sexp-entries):
+	Handle case of no newline at end of file.  (Bug#7536)
+
 2010-12-09  Glenn Morris  <rgm@gnu.org>
 
 	* mail/smtpmail.el (smtpmail-send-it): Revert previous change.
diff --git a/lisp/calendar/diary-lib.el b/lisp/calendar/diary-lib.el
index 219e489a2eb..899c142b75b 100644
--- a/lisp/calendar/diary-lib.el
+++ b/lisp/calendar/diary-lib.el
@@ -1744,7 +1744,7 @@ best if they are non-marking."
         (forward-line 1)
         (while (looking-at "[ \t]")
           (forward-line 1))
-        (backward-char 1)
+        (if (bolp) (backward-char 1))
         (setq entry (buffer-substring-no-properties entry-start (point))))
       (setq diary-entry (diary-sexp-entry sexp entry date)
             literal entry               ; before evaluation